jetson-tk1: Add PSCI configuration options and reserve secure code

The secure world code is relocated to the MB just below the top of 4G, we
reserve it in the FDT (by setting CONFIG_ARMV7_SECURE_RESERVE_SIZE) but it is
not protected in h/w.

Signed-off-by: Ian Campbell <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Thierry Reding <[email protected]>
Tested-by: Thierry Reding <[email protected]>
Tested-by: Ian Campbell <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig
index 36bb636db4cdacbd058f2d8a84cbdd26d6dc22fd..6579e3f30cb6279071ac06fbbb5e2b6e86427938 100644 (file)
--- a/arch/arm/mach-tegra/tegra124/Kconfig
+++ b/arch/arm/mach-tegra/tegra124/Kconfig
@@ -6,6 +6,8 @@ choice
 
 config TARGET_JETSON_TK1
        bool "NVIDIA Tegra124 Jetson TK1 board"
+       select CPU_V7_HAS_NONSEC if !SPL_BUILD
+       select CPU_V7_HAS_VIRT if !SPL_BUILD
 
 config TARGET_NYAN_BIG
        bool "Google/NVIDIA Nyan-big Chrombook"

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 8c016b795519283f829899d2445e2e91d44fcaee..aeafbd5a6cd499ebd3f94502d1ba17a66f7b4745 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -79,4 +79,9 @@
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
+#define CONFIG_ARMV7_PSCI                      1
+/* Reserve top 1M for secure RAM */
+#define CONFIG_ARMV7_SECURE_BASE               0xfff00000
+#define CONFIG_ARMV7_SECURE_RESERVE_SIZE       0x00100000
+
 #endif /* __CONFIG_H */